Review in progress

Please don't merge yet - I am still reviewing and testing, perhaps also committing :)