Beginning basic work
First working test
Merge branch 'dev'