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