I think I might do some poking at it and see if I can find any solutions that I feel are better. I'm just now starting to feel like I've got enough of a feel of mechanics that I won't horribly break things.