complete and utter code rework. So much done