Classes seems to be working fine together, now it's time for the hard part of calculating surplus...