main branch refresh

Trying to merge the newest upstream changes with our newly forked repository. Sorry if this causes an issue. We are new to this.