move stuff around now that koa bug is fixed