Reworking embedded server API
Autocommit Fri Sep 19 13:55:47 EST 2014