Added propOrder tags to classes
Merge branch 'Test_Derek'