I guess it is 2. then. I have not investigated 3. because it is too much effort. I will work on this when I have the time. If you want to merge this now and let me do that as a further PR so we can move forward, that would be great - but I will understand if you want to wait.