Basic functionality in place
Merge branch 'dev'