Update server and client implementation. Misc, connection to base

classes added and implemented.