Deal with and remove all TODO's in the code

[gilbertfl]

Go through the code and deal with TODO's.

Create enhancement issues with any TODO's that need a lot of work to resolve.