update db, rename a few things, start work on orchestrator