Work on the Popcorn refactor