This commit actually breaks the app. Need to fix it.