Simplify a bit
Add note about production flag
improving error/success handling and adding plumber