Add some comments to remember cases still to cover