Moved parameters to each repsective class, framework set up ready for core development