Modularisation

Independent units allow for step-wise inplementation