Basics + large TODO_DRAFT additions