I had a pin in this topic for when I'd next have the motivation. Looks like now is a good time