Major rework.  Introduced Frame.  All tests passing.