Did some animation work

Also started to add in collisions