generifying this app for future forking.
resolving conflict from Diner push.