My version of stuff for merging to main #37

Closed pharris-trinity closed 1 year ago