prototye with bugs
bugs fixed
Merge branch 'develop'