Code on the server

This is the code on the server now. There were merge conflicts earlier. Check it out now.