Removed some OOP and it fixed Lighting!

Now to find a way to add back the OOP but maintain the fixed lighting...