Started work on lighting. Plus other stuff
merge
Apples! (and large merge)
minor merge