Feature/mousetrap 94