Finishing a few TODOS.