commit prior to factoring out BaseHandler