Slimmed/refactored
Merge branch 'HEAD' of https://github.com/SupplementalHealthCare/bridge.git