hacky implementation of animations
Merge of pull request and fixed 12 hour