Refactored some more, worked animations to where they should be. Mostly done