Consolidation Check-In One

First check-in of common logic to this repo.