yes, it probably makes more sense to work on this on a separate feature branch until it is implemented. I will need some time to re-factor the changes into a another branch though ...