Refactoring led to problems in the UnorderedIndexedWritesListDecorator,
which I'm half way though fixing but need to move machines