Fixed stupid in/of issue. Also verified that _update_views isn't called unless required.
Marking off some more find work. Will most likely use async or some such.