Reworking embedded server API
Autocommit Fri Sep 19 14:05:47 EST 2014