working prototype
Merge branch 'dev'