bassic funcationality
Merge branch 'promise'
Merge branch 'master' into archit