Preliminary models set up
Merged simon_dev