Added some more stuff todo.