Added TODOS and Ideas files
Remove unnecessary line
Refactor into proper objects