Big old redo
Cleaned