Initial model work
Model work
Merce conflict