#28 Added some brief notes on how we can adjust our approach to be cleaner - still not convinced that this is the nicest solution. I'm going to follow this through and then re asses whether this is the best design