S38.1[WIP]

[echawk]

This is the new branch for working on updating to S38.1

Still the same issues as the previous pr, but much tidier.

You can run the following to test out the branch:

emacs --load run.el