First draft for the TripleO part