Yeah I'm rushing along to nowhere now, just add the TODO that explains pretty much everything and why this whole dependency even needs all its terrible hacks.