working on adding server side