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