#1 Add better logging.