initial ideas
Merge branch 'michael_dev'