Wip in another branch, adding an issue so I remember it
Wip in another branch, adding an issue so I remember it