Add w.i.p. surplus calculations