Tuakiri twostep changes

Refines code suggested in #181 

For review by @smangelsdorf