@dantleech this seems like we can do this also container output aware, just wanted to confirm before moving forward