#47 -bi refactor - going nicely. Good td/bdd coverage