Draft V2.1 - Fixes addressing 80% of the comments from @EricRothstein. 20% still to be addressed, heavier changes needed / more thinking needed