Fixed server start order
removed etcd wrapper
added in basic context support
Support for contexts is complete