Missed a couple instances of name->command-name
Assume there'll only ever be one Server instance
Preliminary, bare-bones event handler API