Still unwieldy, but I'm working on it.
I was right - this thing is getting unwieldy fast. Probably needs to be organized differently.