added TODOs for new refactoring ideas.