Reorganized a little and actually call the CL code... so the JS should be structurally complete??