next commit. added server control and server building blocks