Reworking embedded server API
Autocommit Thu Sep 18 10:37:35 EST 2014