Animations nearing completion. Major code cleanup required