Simpler front-end, tests. CAn be added afterwards.

...or it can be simulated by adding a group in between.