Drum is working (few changes to make, but still)