More work on dispenser stuff