Episode container first cut
Fixed merge conflicts