changes to stop relying on this.app correctly referencing app in context where it should not necessarily.