Initial commit
First working version
Merge conflicts fixed