Added TODOs
Major refactoring
Refactoring out the project language indexer into indexProjectLanguage()