@shiftkey thanks, nearly ready for review now, just updated all tests. I am rebasing now too.