A stab at collapsed forwarding #47. Bit messy for now.