Animation / Collision handling redone.

Horrible bug where the game won't transition to new screens.