Added a couple TODOs.
Merge branch 'master' of https://github.com/bryanedds/FPWorks