Bring PR #3 changes up to current standards

[ap0ught]

Summary

Bring the older PR #3 changes up to current repository standards and current master.

Context

The PR #3 change set is valid, but it was created against an older tree and now needs to be aligned with the current repo state and style expectations.

Goals

• Rebase or re-apply the change cleanly onto current master
• Resolve merge conflicts without introducing unrelated churn
• Keep the code and file naming consistent with the rest of the repo
• Verify the resulting script(s) still compile and run cleanly

Acceptance Criteria

• The change is mergeable against current master
• The resulting diff is minimal and focused
• Any new or renamed files follow the repo's existing conventions
• Basic syntax/compile verification passes