Preliminary updates to CgMonad