all tests running green!
Model complete!
I'll  try to find new refactors