need to transition to working on a server