More todo based on xpress notes
Began changing tls functions to use new structures