more work on cl4 -> xm conversion
more cl4 conversion
more cl4 conversion
moving the views around