Moved some todo items into source