Added the rest of the logging and got it working, need to merge to server