Some fixes to GTS
Minor refactor - build is currently broker, will fix in 5 hours