This is a junky commit before I do a pull, since that creates merge conlicts for me sometimes. Rough GIT day