Justin TV finalized pull request

Rebased against latest experimental