switching to being based on ampersand-view for better re-usability