server commands refactored
Merge branch 'master' of https://github.com/simbajoe/admiral