Pinpointed some todo-items for further work