Refactoring and Messed with Rendering