Yeah, this is the Guild's #1 problem right now. Today is my last day at this job and I want to set aside a chunk of freetime to resolve this issue (if nothing else). Unfortunately, the issue might demand some serious refactoring to fix.