Disregard last message

Apparently it didn't refactor... Not sure why. It seemed to undo it
all.. Anyway, I'll refactor that at the end.