WIP - trying to figure out what's going on with sc

Work in progress, please ignore! Need to submit a PR to get this to run on Travis.