Joshua branch2

Merge my stuff into Main...we're almost ready to test.