Took out the ReposeInstanceInfo yay!
Converted the PowerFilterRouter stuff to be a factory

Way less nasty, although still pretty nasty.