First commit
Added stuff
merge