WIP since initial review - squash 7 commits