Emergency commit. Things getting messy, but looking better.