Reworking embedded server API
Autocommit Thu Sep 18 09:05:32 EST 2014