Updated the server with the new changes from non-server version. Not sure if it is all 100% correct, there were some extra things in the server version that I wasn't sure if they needed to be kept or deleted...