WIP on normalized members, checkpoint

Generation works okay, now it's time for rewiring.
WIP on member normalization - 1st test