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