That web app looks like it'll be a much more comprehensive calculator in the future. Ours is quite limited: the periods are pre-defined and the top-ups are on a weekly basis only.

But if you have any ideas after trying the tool, let me know. No promises, but I'll consider any suggestions related to the APR calc :)