This works... but it's a bit messy and you get warnings about re-declaring constants...

But I might just merge as is because it works :+1: