Model class implemented

Fixes to linux build
Extra files needed