More server development

Signed-off-by: JimmyCollett <jamesdcollett@gmail.com>