Server

Merge incomplete server and lighting code into master