Reworking embedded server API
Autocommit Fri Sep 19 13:49:25 EST 2014