big mud of code changes, basic server start and stop