Gotcha. I think the TODOs in the other file explained this, lets just try not to lose sight of it.