improving error/success handling and adding plumber