Bugs and Snails

Ref: MABU-02