#154 almost there ...