Finish a working version of persistent classes
fix changes caused by misusing git
Add java representation of CR Data (maybe?)