Working on mapping classes. Testing git again.