In Progress: tc module refactor