Adding logic awareness to the app, NOT TESTED