TimeTypes #167 BIG REWRITE