animations?
fixed bad code
merge