Reworked the payment unit lookup. Still needs a bit of work though...