Hit a Brick wall commit. Need to rethink the design being used.