Complete Overhaul

Too much has changed
Ill will add more back in the next few days