First commit
Need to make it more neat