Things appear to be working now. Slowly re-adding things.