Initial yet working version
Merge
Licence