currently broken on this branch.
Merge pull request #2 from MikeESL/c-s

currently broken on this branch.