Merge pull request #970 from brooksryba/develop

Develop
Finalized pulling in schema objects
Merge pull request #972 from ahomatthew/develop

Finalized pulling in schema objects