@hamogu done! Check it out and if you're happy we can merge.