almost there
merge conflicts
animation working again
remove logging