Adjusted app to use new handle-it