Reworking this whole thing