Updating app to use new framework