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