Refactor so we can consume and publish in the same app.