Reworking. Again. Blah.