Shed loads of changes

Most of the server done