Hello Dave thank you for your reply and checking the code, i think we should do it gradualy step by step when you resolve #15660 we can go ahead, we are hoping you can to finish it soon.

Once done with android we will pay and check IOS. If i can ask you a favour could you please put an app version somwhere so we can see which version we testing and keep track of the progress.