Merging tve and lightbulbs experimental DI

Its me (lightbulb) - just using this repo as a base for merging some code. :)