Basic server update

Improved basic functionality, consolidated server-client pair.