Added todo item
Merge branch 'master' of https://github.com/profbbrown/AutoSim.git
Parameterized some of the generics