Some work on hammer modes (NPE Atm, will fix later!)