shilohbeeler-NI

I'll leave the branch on my fork of the repo so that any code I wrote doesn't just disappear. If I'd had a week more, my plan was to look...