Is there somewhere in the app-framework this could go?
cc @Raydiation