Broke everything for code rework

Will add details of changes on completion of rework