Proposed

Merge what we have so far to master branch