New assumptions, mostly mocked up and to test.