working #18

Merged
derek merged 19 commits from working into main 2025-08-04 21:16:01 -07:00