added more hammer objects and did some refactorings