Initial Raster and Field rewrite mostly done.