mid-refactor, single view entry point.  fix #5