Add hammer commands
Add tests