WIP: cleaning up the animate functions