Need to fix the hardcoded ROOT -> S stuff. Some stuff like arith doesn't use it