Almost ready for a complete mesos roundtrip...