This would be much easier to implement in my new client, open to experimenting there