Setup added
Basic functionality in
Merge branch 'feature/basics' into develop