Added the majority of the model changes for WS244 but this contains an unfinished Construct model.