add a bunch of TODO_DRAFT stuff