Not done yet, but much cleaner

working in the late AM just doesn't work for me anymore