Lots of refactoring.
TE should be more generic now.