[Pre-airplane not-compiling crap] Checkpoint as we transition over to the new akka layer.