Market some TODO stuff as done