More work on forge