Last update before presentation, still todo: TBMVC and rest of components - P.J.S