split out add0 stage into separate class