Replace the nasty last system

[Innectic]

I'm not exactly certain what could do better there, but it's nasty. Could probably be done pretty similar, but maybe it should be stored on the module instead of being passed into Run.

Examples can be seen in each module's Run function.