Moved some raster calculations into the Raster class