Added TODOs in order to remember activities