implementing a promise...
Merge branch 'creating-a-promise' into dev