initial relase of rework and conversion to cherrypy