Merge development work into main #42

Closed bradley-grover closed 11 months ago