made some progress on testing, ctlm basement not updated enough to compile