Feature/schematics revamp

Brady Dowrequested to merge
feature/schematics-revamp into master

Merging down to master, need to bring everything to master and then rethink my tasks / branches.

Merge request reports