(Hopefully) merging dwelch's new commits into my branch