code to be merged

This is the stuff pulled from Elder's repo with most recent updates,
going to try to merge it with our main branch
Revert "code to be merged"

This reverts commit 70da9b7403518f7d7f8155ce5540d9260e603874.