added hammr infrastructure
further customisation