adding animated shapes
from lovelace

not really sure what is in here
moar commitz
Merge
collision stuff almost done