Adding in schema pieces

Drew Stinnettrequested to merge
feature-schema-generation-bits into main

Merge request reports