added hamcrest
tying to refactor the init