added single #TODO
Refactored lots of code; what happened to subs_small.txt???!?