preparing gavel to be more modular