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