Started radically simplifiying the model, next steps are the akka-fication of most of the operations.