Added TODO
Fixing up this mess
Ready for release!