Yep. There's a reason for the way I did it, but clearly I need to change it. Thanks for looking.