Move the view based things out of infrastructure and over to interface
and update the docs