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