Bring in v7.00 code (major update)