continued working tickets #39 and #44, redundand creation is now reduced to twice which still should not happen
Authored by: eziomacmanus 2016-08-02
Parent: [r115]
Child: [r117]
