Animations working, needs a little cleanup.