More WIP.

remove PersistenceService

Make unselect work (still needs more targets)

General refactoring