Sun is working!

I got the sun working now. And I've cleaned up some code.