Works up to 99
Solved at last - 3 rspec tests wrong
Solved - merged from develop branch