Interim commit, compiles. We need to bring in support code now.