new|proj: Added working prototype
Merge branch 'develop'