everything but collection and report
Merge branch 'master' of https://github.com/matannov/matan2