First version
Added tests
First shot for walter