updated all the models validation so they aren't using rocket syntax
Merge branch 'dev' of ssh://personal/codeflash/codeflash into dev