Huge Update

Another huge update