[#1245] Support for GTCs

Good progress!