Reworking embedded server API
Autocommit Fri Sep 19 14:09:48 EST 2014