near final-pretty much all changes have been added