All work done before adding the Model files
Merge branch 'workingcopy' into wc1