olivier_
New PR (part 2 🤣), stability to be improved somewhat still though