code review 11/11 - do not merge

test coverage is in the serious red!