Adding more stuff back in trying to determine what's breaking the boxen.