New rock, moving back to scm (to much dev in progress)