Continue to wire up collection view, refactor ownership code