... well nearly - 4 rspec failures now, down from 9 - TBC