reducing spill code... incomplete
Merge branch 'master' of https://github.com/andrewchambers/cc
shifting some tests