continuing to refactor - much still to do and havent settled on final design