i need to rebuild; actually i'm still missing one more place where we're using globals that i need to fix