I'm still trying to come up with an elegant solution to this, it's taking a bit longer than I'd hoped because I wasn't able to work on it over the weekend as planned. But, I'll try and get an update out asap.
