Reworking embedded server API
Autocommit Fri Sep 19 13:42:24 EST 2014