[Andrew Butcher]

Thanks Robert, your comment is 100% correct, great solution.
The OLG is currently re-writing the SOC to accommodate changes such as the 10year catch-up provision, so be prepared for this.

Regards,
Andrew