Stuffz

This does not address any of the concerns raised in https://github.com/dagolden/Test-DiagINC/issues/1, I am going to think about this later today.

All the changs are just a proposal, I am happy to rework things myself and/or have you rip out pieces.