Commit files

Updated changes for server, including making sure compile works