— Added a pemutator to facilitate testing, etc
— Added some more tests (temporary)