Did some refactoring and cleanup.  Mostly finished TTT