intermediate refactoring: added StarsAndQuivers as an adapter not a layer: now have to add tests