Bunch of stuff -- core data refactor, worse isReal, etc