This is becoming a hot mess. Going to lock and do some clean-up later when I have time.