Feature setup

Development branch

Initial setup