Initial CEW commit (justin's code)
Merge branch 'CEW' into LS