Branch tested OK

- Tests OK, ready to merge.