Rendering Nearly Done

Added More OOP