finishing up todos for now