Adding reworked app code