lots of in progress core data stuff. Checking in before flying. Borken in several ways. Do not use this commit.