Reworking embedded server API
Autocommit Wed Sep 17 15:45:04 EST 2014