Huge Update

Yeah, hopefully the last