Reworking embedded server API
Autocommit Thu Sep 18 10:23:36 EST 2014