new server functionality and tests