Reworking embedded server API
Autocommit Fri Sep 19 09:51:24 EST 2014