Lots of changes.  Made a lot of progress.  Going to merge core_test into v2 to restore my frame files, and get to work on that.