adding types to models
Merge branch 'master' of https://github.com/Alpinfish/S3_G2_Alpha