refactoring, prepping for animation