diff --git a/src/main/scala/geotrellis/Context.scala b/src/main/scala/geotrellis/Context.scala
index 47f733c..49fe67f 100644
--- a/src/main/scala/geotrellis/Context.scala
+++ b/src/main/scala/geotrellis/Context.scala
@@ -101,6 +101,15 @@ class Context(server:Server) {
       case None => sys.error(s"couldn't find raster $name in catalog at ${server.catalog.source}")
     }
 
+  /**
+   * Load RasterLayer from the catalog by name.
+   */
+  def getRasterLayer(name:String):RasterLayer =
+    server.catalog.getRasterLayerByName(name) match {
+      case Some(layer) => layer
+      case None => sys.error(s"couldn't find raster $name in catalog at ${server.catalog.source}")
+    }
+
   def getRasterLayerInfo(name:String):RasterLayerInfo =
     server.catalog.getRasterLayerByName(name) match {
       case Some(layer) => layer.info
diff --git a/src/main/scala/geotrellis/io/LoadUncachedTileSet.scala b/src/main/scala/geotrellis/io/LoadUncachedTileSet.scala
deleted file mode 100644
index 40dc55b..0000000
--- a/src/main/scala/geotrellis/io/LoadUncachedTileSet.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package geotrellis.io
-
-import geotrellis._
-import geotrellis.process._
-
-/**
- * Load a set of tiles from a specified directory, without caching the tiles into memory. 
- *
- * This directory must contain a layout.json file as well as tiles written
- * in the ARG format.
- */
-case class LoadUncachedTileSet(path:Op[String]) extends Op[Raster] {
-  def _run(context:Context) = runAsync(path :: context :: Nil)
-  val nextSteps:Steps = {
-    case (p:String) :: (c:Context) :: Nil => Result(c.loadUncachedTileSet(p))
-  }
-}
diff --git a/src/main/scala/geotrellis/process/TileSetRasterLayer.scala b/src/main/scala/geotrellis/process/TileSetRasterLayer.scala
index b1f5064..4856fa9 100644
--- a/src/main/scala/geotrellis/process/TileSetRasterLayer.scala
+++ b/src/main/scala/geotrellis/process/TileSetRasterLayer.scala
@@ -144,6 +144,8 @@ extends RasterLayer(info) {
                       tileLayout,
                       getTileLoader)
 
+  def getTile(col:Int, row:Int) = getTileLoader().getTile(col,row)
+
   def getTileLoader() =
     if(isCached)
       new CacheTileLoader(info,tileLayout,getCache)
diff --git a/src/main/scala/geotrellis/raster/TiledRasterData.scala b/src/main/scala/geotrellis/raster/TiledRasterData.scala
index 91a49a3..bf32d77 100644
--- a/src/main/scala/geotrellis/raster/TiledRasterData.scala
+++ b/src/main/scala/geotrellis/raster/TiledRasterData.scala
@@ -221,11 +221,8 @@ case class TileSetRasterData(basePath:String,
     }
   }
 
-  override def getTileOp(rl:ResolutionLayout, c:Int, r:Int):Op[Raster] = {
-    logic.Do(() => 
-      Raster(getTile(c,r), loader.resLayout.getRasterExtent(c,r))
-    )
-  }
+  override def getTileOp(rl:ResolutionLayout, c:Int, r:Int):Op[Raster] = 
+    io.LoadRasterTile(name, c, r)
 
   def asTileArray:TileArrayRasterData = {
     val re = loader.rasterExtent
@@ -244,12 +241,19 @@ class TileArrayRasterData(val tiles:Array[Raster],
                           val rasterExtent:RasterExtent) extends TiledRasterData  with Serializable {
   val typ = tiles(0).data.getType
   def alloc(cols:Int, rows:Int) = RasterData.allocByType(typ, cols, rows)
-  def getType = typ
+  def getType = typ 
   def getTile(col:Int, row:Int) = tiles(row * tileCols + col).data match {
     case i:IntConstant => i
     case a:ArrayRasterData => LazyArrayWrapper(a)
     case o => o
   }
+
+  /**
+   * getTileOp will return a Literal raster operation.
+   * 
+   * Note that this means that distributing work on a TileArrayRasterData
+   * means that the data will be sent over the network.
+   */
   def getTileOp(rl:ResolutionLayout, c:Int, r:Int):Op[Raster] =
     Literal(getTileRaster(rl, c, r))
 }
diff --git a/src/test/scala/geotrellis/raster/tiles.scala b/src/test/scala/geotrellis/raster/tiles.scala
index b330bd5..8f13e2d 100644
--- a/src/test/scala/geotrellis/raster/tiles.scala
+++ b/src/test/scala/geotrellis/raster/tiles.scala
@@ -212,6 +212,11 @@ class TileSpec extends FunSpec with MustMatchers
       val op = stat.Min(tileRaster)
       val z = run(op)
       z must be === 1
+
+      // test TileSetRasterData
+      val op2 = stat.Min(io.LoadRaster("mtsthelens_tiled_cached"))
+      val z2 = run(op2)
+      z2 must be === 2231
     }
   }
 
