Animation refactor.
Based on http://www.youtube.com/watch?v=ma5QWDYsmBg