Merge pull request #1 from AriGonzo/feature/completeTD

Feature/complete td
Revert "Feature/complete td"
Merge pull request #3 from AriGonzo/revert-1-feature/completeTD

Revert "Feature/complete td"
fixed merge...hopefully