Refactoring of Goals and Contribution, introduction of todos