Initial commit
Added some options - Doesn't work yet
Merging conflicts - importing from github