Add todos for later checking