Add Electric Hammer + Refactoring