issue #6, flushing out parts of CST impl
Merge remote-tracking branch 'origin/master'