KRACOEUS-6982: More Prop Dev initial save goodness

KRACOEUS-6982: Address issues raised in comments
Merge pull request #96 from tharpgc/remove-propdev-lookups-2

KRACOEUS-6982: More Prop Dev initial save goodness