Add forgotten files and remove TODOs
Merge pull request #1 from BryanSmithDev/development

Add forgotten files and remove TODOs