backport all these cool new features to the master branch

[jeremy21212121]

I have significantly changed the layout of the project. As such, it may be somewhat inconvenient to port these features to master.

It might be easier to merge in all the changes, then change the config to suit the other project.

This whole one-project-per-branch thing isn't really working for me. This issue is related to #1, which contemplates adapting this into a personal library that can then be more easily used with other projects.