Reworking some shiz.
Reworking.