Animate rotation dev ellery

Merge with liz 's branch