Add a todo-bug. Prepare to move the dependancies module to an individual module