WIP: Refactors to RasterExtent, Extent, Raster