Clean Up and trying to add animations