Here's an update, please comments on any parts looking weird. Also played some with shockwave, take a look here