started moving most of the datahandling from client side to server side models