Adds Di interface, tests, logic.
Removes rogue hard tabs