Reworking embedded server API
Autocommit Thu Sep 18 14:40:40 EST 2014