More work on drums + other stuff