Steps Towards New Infrastructure

changes to support the new data model.