Making some updates for Seinfeld, but need to do some serious refactoring..