Initial commit
First attempt
Added some more tests