v6 rebuild Update Aug 25

Last build before testing online