WIP splitting out persistent views

errors, probably bad