Lo and Behold

Changed everything to be the way it should be, unless it shouldn't.