Working on adding server functionality