Added TC functionality

Todo: see onenote