Merging rewrite into master

[GabeRundlett]

I haven't made any modifications to the base branch in a while. I guess it's time to merge the rewrite in