huge refactoring + collections reworked in collectionviews