Feature/#250 making server autonomous

Needs reviewing.