Fixed a bug where properties where not being extended properly. Refactored animate method.