Bit more of structure, tests for it