refactor + first steps of animation