doing some refactoring, getting ready to gauge FPS