refactor

Starting to rethink how the CST should look...