I don't think it's worth keeping this implementation, I don't like it :).  It's half-way between my original conception and the design we're going to end up with. I am fine making changes post-merge, though, since it does function.