finished TC rewrite

YAY