Starting on proof of concept
rename file
style changes
correct the callback
file
Merge branch 'master' into new-master