Will leave modularization to the point where we implement that--skipping out on that for now.  This is old code.