Adding the app based on Ammar's implementation