Added a few more places to save on the server side. A little broken atm.