Code review 11 11 - do not merge

test coverage is very much in the red