basic animation and cleaning up standard scene
yelded on merge conflicts