cleaned up code, animaton wip