Major refactoring; additions to CyTables