animation added! now, time to refactor