Looks like merging in #198, because this pull req was based off of it, caused some kind of issue. Going to have to keep this in mind going forward because it's obnoxious as hell. Creating a new (clean) pull req.