Merge in changes

Hey Will!

How's things?

I'm looking to do some more on this script in the next week or two and would like to merge your changes back into the main repo.