Added TODOS for practice, but no code removal yet