wip for persistence, solved ownership, better handling of collections, api adjustments
Merge remote-tracking branch 'origin/master'