For the time being, this doesn't do this though, so I am worried that inertia will prevent us from moving towards that. Do we want to integrate that in here/now?