new stuff

blbla
Merge branch 'idea-1'
Merge branch 'idea-2' into idea-1