1st stage in modularising