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