Major Update

All my stuff that failed previously