hammer2 - Refactor frontend part 14/many