Design and Implementation v2

Summary
Second iteration of the design defined and implementation carried out in T5.1, T5.2, T5.3.