add rabbit and better logging