#218 for this one, as a general overhaul because I'm certain I broke the rule several times.