Moving fields around a bit.