Cleans up includes
Adds full 3D rendering