소스 검색

refactoring, refining... wip

Aneurin Anny Barker Snook 9 년 전
부모
커밋
72e4edd90d
1개의 변경된 파일224개의 추가작업 그리고 245개의 파일을 삭제
  1. 224 245
      piston.tidal

+ 224 - 245
piston.tidal

@@ -1,80 +1,90 @@
 {-
 {-
 piston lp
 piston lp
+by aneurin "anny" barker snook
+http://anny.audio
 -}
 -}
 
 
-cps (138/60)
+let chdrum = d1
+let chdrum2 = d2
+let chbass = d3
+{-
+let x = d4
+let x = d5
+let x = d6
+let x = d7
+let x = d8
+let x = d9
+-}
+let chextra = d10
 
 
-let bassParams = (|+| gain "0.7").(|+| hcutoff "0.022").(|+| hresonance "0.001")
+let msil = mapM_ ($ silence)
 
 
-let kdelay = (|+| delay "0.3").(|+| delayfeedback "0.5").(|+| delaytime "0.766") --(138/60)/3
+-- let's go
 
 
-let gprop = (|+| speed "1.2").(|+| shape ((/2) <$> ((0.25 ~>) . density 3) sinewave1)).(|+| gain "0.6")
+cps (138/60)
 
 
-{-
-piston 0
--}
+let introfly = slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
+               |+| hcutoff "0.09"
+               |+| hresonance "0.06"
 
 
-d5 $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
-   |+| hcutoff "0.09"
-   |+| hresonance "0.06"
--- |+| gain "0.1" |+| gain "1"
-   |+| gain "1"
+d5 $ introfly
+  |+| gain "1" -- "0.1" to "1"
 
 
 {-
 {-
 piston 1.a
 piston 1.a
 -}
 -}
 
 
-d1 $ sound "k:1"
-d2 $ sound "wt/2"
+chdrum $ sound "k:1"
+chdrum2 $ sound "wt/2"
 
 
-d3 $ slow 8 $ (<~) (1/4) $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+let bassParams = (|+| gain "0.7").
+                 (|+| hcutoff "0.022").
+                 (|+| hresonance "0.001")
 
 
-d2 $ sound "{wt/2, [~ wtsn]/8}"
+let bassic = rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
 
 
-d1 $ sound "k"
-d1 $ sound "{k, ~ sn}"
+chbass $ slow 8 $ (0.25 <~) $ bassic
 
 
-d5 $ whenmod 5 2 (|+| vowel "i o") $ whenmod 3 1 (slow 2) $ brak $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
-   |+| hcutoff "0.09"
-   |+| hresonance "0.06"
+chdrum2 $ sound "{wt/2, [~ wtsn]/8}"
 
 
-d2 $ density (4%3) $ sound "[wtsn ~ wt]"
-d2 $ whenmod 5 3 rev $ density (4%3) $ sound "[wtsn ~ wt]"
-d2 $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
+chdrum $ sound "k"
+chdrum $ sound "{k, ~ sn}"
 
 
-d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
+d5 $ whenmod 5 2 (|+| vowel "i o") $ whenmod 3 1 (slow 2) $ brak $ introfly
 
 
-d4 $ within (0, 0.5) rev $ chop 8 $ sound "[gnome(3,8)]/2"
-   |+| gain "0.8"
-   |+| speed ((+0.8).(/5) <$> slow 1.1 sinewave1)
+let p1sn = density (4%3) $ sound "[wtsn ~ wt]"
 
 
-d1 $ sound "{k, [~ ~ sn [~ sn*3]/2]/2}"
+chdrum2 $ p1sn
+chdrum2 $ whenmod 5 3 rev $ p1sn
+chdrum2 $ whenmod 5 3 (rev . chop 8) $ p1sn
 
 
-mapM_ ($ silence) [d1,d3]
+chdrum2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ p1sn
 
 
-d1 $ sound "[k(3,8)]/2"
-d1 $ sound "{k(3,8), [~ sn]}/2"
-d1 $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
+d4 $ within (0, 0.5) rev $ chop 8 $ sound "[gnome(3,8)]/2"
+  |+| gain "0.8"
+  |+| speed ((+0.8).(/5) <$> slow 1.1 sinewave1)
 
 
-d3 $ (every 2 $ within (0.25, 0.75) (0.5 ~>)) $ slow 8 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+let p1sn2 = sound "[~ ~ sn [~ sn*3]/2]/2"
+chdrum $ overlay p1sn2 $ sound "k"
 
 
-mapM_ ($ silence) [d2,d5]
+msil [chdrum,chbass]
 
 
-d1 $ within (0.5, 1) (chop 8) $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
+let p1k = sound "[k(3,8)]/2"
 
 
-d5 $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
-   |+| hcutoff "0.09"
-   |+| hresonance "0.06"
--- |+| gain "0.1" |+| gain "1"
-   |+| gain "1"
+chdrum $ p1k
+chdrum $ overlay (sound "[~ sn]/2") $ p1k
+chdrum $ overlay p1sn2 $ p1k
 
 
-d2 $ sound "[~ wt*4 ~ wt*2 ~]/5"
+chbass $ (every 2 $ within (0.25, 0.75) (0.5 ~>)) $ slow 8 $ bassic
 
 
-d1 $ within (0.5, 1) (chop 8) $ sound "{[[k*2 ~] ~], [~ ~ sn [~ sn*3]/2]}/2"
+msil [chdrum2,d5]
 
 
-d4 silence
+chdrum $ within (0.5, 1) (chop 8) $ overlay p1sn2 $ p1k
+d5 $ introfly
+chdrum2 $ sound "[~ wt*4 ~ wt*2 ~]/5"
+chdrum $ within (0.5, 1) (chop 8) $ overlay p1sn2 $ sound "[[k*2 ~] ~]/2"
 
 
-mapM_ ($ silence) [d1,d5]
+msil [chdrum,d5]
 
 
 {-
 {-
 piston 1.b
 piston 1.b
@@ -82,146 +92,136 @@ piston 1.b
 
 
 d4 silence
 d4 silence
 
 
-d1 $ sound "[k [sn k] [k sn] [~ sn] [~ k] sn [k [k wtsn]]]/7"
+let drum7 = sound "[k [sn k] [k sn] [~ sn] [~ k] sn [k [k wtsn]]]/7"
+chdrum $ drum7
 
 
-d2 $ sound "wt*2"
-|+| vowel "[u e u a]/2"
+chdrum2 $ sound "wt*2"
+   |+| vowel "[u e u a]/2"
 
 
-d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| speed "1.2"
-   |+| shape ((/2) <$> density 4 sinewave1)
-   |+| cut "1"
+let p2bass = slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
+             |+| speed "1.2"
+             |+| shape ((/2) <$> density 4 sinewave1)
+             |+| cut "1"
+
+chbass $ p2bass
 
 
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
    |+| cutoff "0.08" |+| resonance "0.01"
    |+| cutoff "0.08" |+| resonance "0.01"
 
 
-d7 $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+let p2shard = chop 16 $ sound "[ice [~ ice] ~ ~]/4"
+              |+| gain "0.7"
+
+d7 $ ((1%16) <~) $ p2shard
 
 
 d8 $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
 d8 $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
 
 
-d4 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
-   |+| cut "1"
-   |+| begin "0.3"
-   |+| end "0.35"
-   |+| shape ((+0.25).(/2) <$> density 8 sinewave1)
-   |+| speed ((+1) <$> density (5%4) saw1)
+let p2fly = chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
+            |+| cut "1"
+            |+| begin "0.3"
+            |+| end "0.35"
+            |+| shape ((+0.25).(/2) <$> density 8 sinewave1)
+            |+| speed ((+1) <$> density (5%4) saw1)
 
 
-mapM_ ($ silence) [d1,d2,d3,d7,d8]
+d4 $ p2fly
 
 
-d1 $ (0.5 <~) $ sound "[[k k:1] [sn ~ ~ k]]/2"
+msil [d1,d2,d3,d7,d8]
 
 
-d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| speed "1.2"
-   |+| shape ((/2) <$> density 4 sinewave1)
-   |+| cut "1"
+chdrum $ (0.5 <~) $ sound "[[k k:1] [sn ~ ~ k]]/2"
 
 
-d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| speed "1.2"
-   |+| shape ((/2) <$> density 4 sinewave1)
-   |+| cut "1"
-   |+| vowel "u a"
+chbass $ p2bass
+chbass $ p2bass |+| vowel "u a"
 
 
-d7 $ rev $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+d7 $ rev $ p2shard
    |+| shape ((+0.25).(/2) <$> density 8 saw1)
    |+| shape ((+0.25).(/2) <$> density 8 saw1)
 
 
-d7 $ every 2 (density 1.5) $ whenmod 5 3 (density 2) $ rev $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+d7 $ every 2 (density 1.5) $ whenmod 5 3 (density 2) $ rev $ p2shard
    |+| shape ((+0.25).(/2) <$> density 8 saw1)
    |+| shape ((+0.25).(/2) <$> density 8 saw1)
 
 
-d2 $ sound "~ wt*2"
+chdrum2 $ sound "~ wt*2"
 
 
 {-
 {-
 piston 1.c
 piston 1.c
 -}
 -}
 
 
-mapM_ ($ silence) [d1,d3,d4,d9]
+msil [d1,d3,d4,d9]
 
 
-d1 $ sound "k"
+chdrum $ sound "k"
 
 
 d6 $ sound "[ff(3,8) [~ [ff bz]]]/4"
 d6 $ sound "[ff(3,8) [~ [ff bz]]]/4"
    |+| end "0.3"
    |+| end "0.3"
    |+| shape "0 0.25"
    |+| shape "0 0.25"
    |+| gain "0.7"
    |+| gain "0.7"
 
 
-d1 silence
+chdrum silence
 
 
-d1 $ sound "[k k sn k]/2"
+chdrum $ sound "[k k sn k]/2"
 
 
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| vowel "i"
-
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| vowel "o i"
+let p3bass v c b = (4 <~) $ every 2 (0.5 <~) $ slow 4 . (if b then brak else id) $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+                   |+| cut c
+                   |+| vowel v
 
 
-d1 $ overlay (sound "[~ sn]/2") $ sound "[k*2 [~ k*2] k ~ k*2 ~ k*2 ~]/8"
-
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 . brak $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| vowel "o i"
+let p3drum = overlay (sound "[~ sn]/2") $ sound "[k*2 [~ k*2] k ~ k*2 ~ k*2 ~]/8"
 
 
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 . brak $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| vowel "o i"
+chbass $ p3bass "i" "1" False
+chbass $ p3bass "o i" "1" False
+chdrum $ p3drum
+chbass $ p3bass "o i" "1" True
+chbass $ p3bass "o i" "0" True
 
 
-mapM_ ($ silence) [d2,d7]
+msil [d1,d2,d7]
 
 
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 . brak $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| vowel "o i"
+chbass $ p3bass "o i" "1" True
 
 
-d2 $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
-d2 $ within (0.5, 1.5) (kdelay) $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+let p2d2 = sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+chdrum2 $ p2d2
 
 
-d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| speed "0.2"
-   |+| vowel "e"
+let kdelay = (|+| delay "0.3").
+             (|+| delayfeedback "0.5").
+             (|+| delaytime "0.766") --(138/60)/3
 
 
-d2 $ chop 16 $ within (0.5, 1.5) (kdelay) $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+let weirdub = slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+              |+| cut "1"
+              |+| speed "0.2"
+              |+| vowel "e"
 
 
-d2 $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+d8 $ weirdub
+chdrum $ p3drum
+chdrum2 $ within (0.5, 1.5) (kdelay) $ p2d2
+chdrum2 $ chop 16 $ within (0.5, 1.5) (kdelay) $ p2d2
+chdrum2 $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ p2d2
 
 
-d7 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+d7 $ (0.5 <~) $ ((1%16) <~) $ p2shard
 
 
-d2 $ whenmod 3 2 rev $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+chdrum2 $ whenmod 3 2 rev $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ p2d2
 
 
-d2 $ within (0, 0.5) (|+| vowel "o") $ whenmod 3 2 rev $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ sound "[[k:1 [~ k:1] k:1 [~ k:1]] sn]/8"
+chdrum2 $ within (0, 0.5) (|+| vowel "o") $ whenmod 3 2 rev $ chop 16 $ within (0.5, 1.5) (kdelay) $ overlay (sound "~ wt*2") $ p2d2
 
 
-d7 $ iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
+d7 $ iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ p2shard
    |+| vowel "e o"
    |+| vowel "e o"
 
 
-d3 $ (4 <~) $ every 2 (0.5 <~) $ slow 4 . brak $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| vowel "o i"
-
-mapM_ ($ silence) [d3,d7,d8]
-
-d1 $ sound "[k k sn k]/2"
+chbass $ p3bass "o i" "0" True
+msil [d3,d7,d8]
+chdrum $ sound "[k k sn k]/2"
 
 
 {-
 {-
-piston 2.a
+piston 2
 -}
 -}
 
 
-solo $ d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| speed "0.2"
-   |+| vowel "e"
+solo $ d3 $ weirdub
 
 
-d2 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
+let p4d2 = sound "[[~ [wt wtsn]] ~ wt ~]/5"
+chdrum2 $ p4d2
 
 
-d7 $ within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound "[ice plode]*2"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-   |+| gain "0.7"
+let p4plode s = within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound s
+              |+| cutoff "0.02"
+              |+| resonance "0.001"
+              |+| speed "0.7"
+              |+| gain "0.7"
 
 
-d1 $ sound "[k sn k*2 [~ sn] [~ k]]/5"
+d7 $ p4plode "[ice plode]*2"
 
 
-d2 $ smash 4 [0.5,0.25] $ iter 3 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
+chdrum $ sound "[k sn k*2 [~ sn] [~ k]]/5"
+chdrum2 $ smash 4 [0.5,0.25] $ iter 3 $ p4d2
 
 
 d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
 d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
    |+| speed ((+1) <$> density 1.7 sinewave1)
    |+| speed ((+1) <$> density 1.7 sinewave1)
@@ -229,67 +229,44 @@ d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
 
 
 d8 silence
 d8 silence
 
 
-d7 $ whenmod 7 3 (density (5%4)) $ within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound "[ice plode]*2"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-   |+| gain "0.7"
+d7 $ whenmod 7 3 (density (5%4)) $ p4plode "[ice plode]*2"
 
 
-d1 $ sound "[[k k:1]*2 sn k*2 [~ sn] [~ k]]/5"
+chdrum $ sound "[[k k:1]*2 sn k*2 [~ sn] [~ k]]/5"
 
 
-d3 $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
+chbass $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
    |+| speed "0.5"
    |+| speed "0.5"
    |+| cut "1"
    |+| cut "1"
    |+| end "0.5"
    |+| end "0.5"
 
 
-mapM_ ($ silence) [d2,d4,d7]
-
-d4 $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bz" (density 1.5 "0 1"))
-   |+| speed ((+1.6) <$> density 2.2 sinewave1)
-   |+| pan ((+0.25).(/2) <$> density 4.1 sinewave1)
-
-d1 $ sound "[k*2 sn [~ k] sn]/4"
-
-d4 $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bz*2" (density 1.5 "0 1"))
-   |+| speed ((+1.6) <$> density 2.2 sinewave1)
-   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
-
-d7 $ whenmod 7 3 (density (5%4)) $ within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound "[ice wtsn]*2"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-   |+| gain "0.7"
-   |+| vowel "u e"
-
-d4 $ every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bz*2" (density 1.5 "0 1"))
-   |+| speed ((+1.6) <$> density 2.2 sinewave1)
-   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
-
-d2 $ smash 4 [0.5,0.25] $ iter 3 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
+msil [d2,d4,d7]
 
 
-d1 silence
-d1 $ sound "[[k ~ ~ k] sn [~ k] sn]/4"
+let p4bz s = whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples s (density 1.5 "0 1"))
+             |+| speed ((+1.6) <$> density 2.2 sinewave1)
+             |+| pan ((+0.25).(/2) <$> density 4.1 sinewave1)
 
 
-d4 $ every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bz bzl" (density 1.5 "0 1"))
-   |+| cut "1"
-   |+| speed ((+1.6) <$> density 2.2 sinewave1)
-   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
+d4 $ p4bz "bz"
+chdrum $ sound "[k*2 sn [~ k] sn]/4"
+d4 $ p4bz "bz*2"
+d7 $ whenmod 7 3 (density (5%4)) $ p4plode "[ice wtsn]*2" |+| vowel "u e"
+d4 $ every 3 brak $ p4bz "bz*2"
 
 
-mapM_ ($ silence) [d2,d3,d7]
+chdrum2 $ smash 4 [0.5,0.25] $ iter 3 $ p4d2
+chdrum silence
+chdrum $ sound "[[k ~ ~ k] sn [~ k] sn]/4"
 
 
-d4 $ every 2 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bz*2" (density 1.5 "0 1"))
-   |+| speed ((+1.6) <$> density 2.2 sinewave1)
-   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
+d4 $ every 3 brak $ p4bz "bz bzl"
 
 
-d1 $ sound "[k sn k*2 [~ sn] [~ k]]/5"
+msil [d2,d3,d7]
+d4 $ every 2 brak $ p4bz "bz*2"
+chdrum $ sound "[k sn k*2 [~ sn] [~ k]]/5"
 
 
 {-
 {-
-piston 2.b
+piston 3
 -}
 -}
 
 
 solo $ d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
 solo $ d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
 
 
-d2 $ sound "~ wt wt wtsn/8"
+chdrum2 $ sound "~ wt wt wtsn/8"
    |+| shape ((/2) <$> density 1.2 saw1)
    |+| shape ((/2) <$> density 1.2 saw1)
 
 
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
@@ -297,24 +274,24 @@ d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
 
 
 d9 silence
 d9 silence
 
 
-d1 $ sound "{[k ~ ~ k:1], [~ sn]/2}"
+chdrum $ sound "{[k ~ ~ k:1], [~ sn]/2}"
 
 
-d3 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
 
 
 d5 $ whenmod 5 3 rev $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
 d5 $ whenmod 5 3 rev $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
    |+| speed "0.7"
    |+| speed "0.7"
    |+| shape ((/2) <$> density 2.1 saw1)
    |+| shape ((/2) <$> density 2.1 saw1)
 
 
-d3 $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
 
 
 d5 silence
 d5 silence
 
 
-d3 $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
 
 
-d3 $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
 
 
 d6 $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
 d6 $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
@@ -323,7 +300,7 @@ d6 $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
 d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
 d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
    |+| speed "0.9"
 
 
-d3 $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
 
@@ -331,6 +308,8 @@ d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
    |+| speed "0.9"
    |+| shape ((/3) <$> density 3 sinewave1)
    |+| shape ((/3) <$> density 3 sinewave1)
 
 
+let gprop = (|+| speed "1.2").(|+| shape ((/2) <$> ((0.25 ~>) . density 3) sinewave1)).(|+| gain "0.6")
+
 d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
 d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
    smash 64 [0.5,1] $ gprop $ sound "~ gnome"
    smash 64 [0.5,1] $ gprop $ sound "~ gnome"
    |+| pan (slow 4 sinewave1),
    |+| pan (slow 4 sinewave1),
@@ -338,13 +317,13 @@ d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
    |+| pan ((0.5 <~) $ slow 4 sinewave1)
    |+| pan ((0.5 <~) $ slow 4 sinewave1)
 ]
 ]
 
 
-d3 $ within (0.5, 0.75) (|+| vowel "u o") $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ within (0.5, 0.75) (|+| vowel "u o") $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
 
-mapM_ ($ silence) [d1,d3]
+msil [d1,d3]
 
 
-d1 $ sound "k:1"
+chdrum $ sound "k:1"
 
 
 d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
 d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
    |+| speed "0.9"
@@ -360,24 +339,24 @@ d5 $ whenmod 5 3 rev $ brak $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParam
    |+| speed "0.7"
    |+| speed "0.7"
    |+| shape ((/2) <$> density 2.1 saw1)
    |+| shape ((/2) <$> density 2.1 saw1)
 
 
-d3 $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
 
-d1 $ sound "{[k ~ ~ k:1], [~ sn]/2}"
+chdrum $ sound "{[k ~ ~ k:1], [~ sn]/2}"
 
 
-mapM_ ($ silence) [d2,d6]
+msil [d2,d6]
 
 
 d7 silence
 d7 silence
 
 
-d3 $ (|+| gain ((*0.7) <$> saw1)) $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
+chbass $ (|+| gain ((*0.7) <$> saw1)) $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
 
-mapM_ ($ silence) [d1,d5]
+msil [d1,d5]
 
 
 {-
 {-
-piston 2.c
+piston 4
 -}
 -}
 
 
 d6 $ within (0, 0.5) (slow (7%6)) $ every 2 (0.5 <~) $ slow 8 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 d6 $ within (0, 0.5) (slow (7%6)) $ every 2 (0.5 <~) $ slow 8 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
@@ -393,11 +372,11 @@ d7 $ sound "[cymb*8 ~]/8"
    |+| cut "1"
    |+| cut "1"
 -}
 -}
 
 
-d2 $ sound "wt*2"
-|+| vowel "[u e u a]/2"
+chdrum2 $ sound "wt*2"
+   |+| vowel "[u e u a]/2"
 
 
-d3 silence
-d1 $ sound "{k, [~ ~ ~ k:1] [~ k:1]}"
+chbass silence
+chdrum $ sound "{k, [~ ~ ~ k:1] [~ k:1]}"
 
 
 d4 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 d4 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 
 
@@ -410,14 +389,14 @@ d7 $ density (5%4) $ whenmod 9 4 (density 1.5) $ sound "[cymb*8 cymb*3]/8"
 d8 $ (3 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
 d8 $ (3 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
    |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
    |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
 
 
-d1 $ sound "{k, [~ ~ ~ k:1] [~ k:1], [~ sn ~ sn*2]/8}"
+chdrum $ sound "{k, [~ ~ ~ k:1] [~ k:1], [~ sn ~ sn*2]/8}"
 
 
-d3 $ (0.6 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
+chbass $ (0.6 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
    |+| speed "0.5"
    |+| speed "0.5"
    |+| cut "1"
    |+| cut "1"
    |+| end "0.5"
    |+| end "0.5"
 
 
-mapM_ ($ silence) [d2,d4,d8]
+msil [d2,d4,d8]
 
 
 d4 $ iter 4 $ density (9%8) $ within (0, 0.5) rev $ smash 8 [1,2] $ sound "[gnome(3,8)]/2"
 d4 $ iter 4 $ density (9%8) $ within (0, 0.5) rev $ smash 8 [1,2] $ sound "[gnome(3,8)]/2"
    |+| gain "0.8"
    |+| gain "0.8"
@@ -427,9 +406,9 @@ d4 $ iter 4 $ density (9%8) $ within (0, 0.5) rev $ smash 8 [1,2] $ sound "[gnom
    |+| gain "0.8"
    |+| gain "0.8"
    |+| speed ((+0.76).(/3) <$> slow 1.1 sinewave1)
    |+| speed ((+0.76).(/3) <$> slow 1.1 sinewave1)
 
 
-mapM_ ($ silence) [d1,d5,d6,d7]
+msil [d1,d5,d6,d7]
 
 
-d1 $ stack [
+chdrum $ stack [
    sound "[[k k:1]*2 [~ k:1 ~ k] [~ k:1 k ~] [~ ~ ~ k]]/8",
    sound "[[k k:1]*2 [~ k:1 ~ k] [~ k:1 k ~] [~ ~ ~ k]]/8",
    whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
    whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
 ]
 ]
@@ -444,19 +423,19 @@ d5 $ whenmod 5 3 rev $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sou
 
 
 d6 $ within (0, 0.5) (slow (7%6)) $ every 2 (0.5 <~) $ slow 8 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 d6 $ within (0, 0.5) (slow (7%6)) $ every 2 (0.5 <~) $ slow 8 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 
 
-d1 $ sound "{k, [~ ~ ~ k:1] [~ k:1], [~ sn ~ sn*2]/8}"
+chdrum $ sound "{k, [~ ~ ~ k:1] [~ k:1], [~ sn ~ sn*2]/8}"
 
 
-mapM_ ($ silence) [d2,d5,d6,d7]
+msil [d2,d5,d6,d7]
 
 
-d1 $ whenmod 3 2 (slow (4%3)) $ sound "[k*2 [sn ~ ~ wt] k*2 sn [~ k]]/5"
+chdrum $ whenmod 3 2 (slow (4%3)) $ sound "[k*2 [sn ~ ~ wt] k*2 sn [~ k]]/5"
 
 
 {-
 {-
-piston 3.a
+piston 5
 -}
 -}
 
 
 solo $ d1 $ whenmod 3 2 (slow (4%3)) $ sound "[k*2 [sn ~ ~ wt] k*2 sn [~ k]]/5"
 solo $ d1 $ whenmod 3 2 (slow (4%3)) $ sound "[k*2 [sn ~ ~ wt] k*2 sn [~ k]]/5"
 
 
-d1 $ every 3 (density 2) $ within (0, 0.5) (jux ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
+chdrum $ every 3 (density 2) $ within (0, 0.5) (jux ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
 
 d7 $ slow 5 . chop 15 $ sound "ice"
 d7 $ slow 5 . chop 15 $ sound "ice"
    |+| gain "0.7"
    |+| gain "0.7"
@@ -464,12 +443,12 @@ d7 $ slow 5 . chop 15 $ sound "ice"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.02"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.02"
 
 
 hush
 hush
-d1 $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
+chdrum $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
 
-d2 $ sound "[wt*3 ~]/2"
-|+| shape ((/2) <$> slow 3 saw1)
+chdrum2 $ sound "[wt*3 ~]/2"
+   |+| shape ((/2) <$> slow 3 saw1)
 
 
-d3 $ slow 8 $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
+chbass $ slow 8 $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
 
 
 d4 $ slow (4%3) . slowspread ($) [slow 1, density (5%4)] $ slow 12 $ slowspread striate [24,36] $ sound "fly:1"
 d4 $ slow (4%3) . slowspread ($) [slow 1, density (5%4)] $ slow 12 $ slowspread striate [24,36] $ sound "fly:1"
    |+| gain "0.7"
    |+| gain "0.7"
@@ -481,52 +460,52 @@ d4 $ slow (4%3) . slowspread ($) [slow 1, density (5%4)] $ slow 12 $ slowspread
 d6 $ rev . chop 12 $ sound "bz/4"
 d6 $ rev . chop 12 $ sound "bz/4"
    |+| vowel "o"
    |+| vowel "o"
 
 
-mapM_ ($ silence) [d1,d2]
+msil [d1,d2]
 
 
-d3 $ (|+| begin ((/2) <$> (density (5%4) $ sinewave1))) $ (|+| end ((+0.05).(/2) <$> (density (5%4) $ sinewave1))) $ slow 8 $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
+chbass $ (|+| begin ((/2) <$> (density (5%4) $ sinewave1))) $ (|+| end ((+0.05).(/2) <$> (density (5%4) $ sinewave1))) $ slow 8 $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
 
 
 d7 $ slow 5 . chop 15 $ sound "ice"
 d7 $ slow 5 . chop 15 $ sound "ice"
    |+| gain "0.7"
    |+| gain "0.7"
    |+| resonance "0.4" |+| cutoff "0.2"
    |+| resonance "0.4" |+| cutoff "0.2"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.02"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.02"
 
 
-d1 $ sound "{k, ~ sn}"
-d1 $ sound "[[k ~ k] {k, sn}]/2"
+chdrum $ sound "{k, ~ sn}"
+chdrum $ sound "[[k ~ k] {k, sn}]/2"
 
 
 d7 $ slow 5 . chop 15 $ sound "ice"
 d7 $ slow 5 . chop 15 $ sound "ice"
    |+| gain "0.7"
    |+| gain "0.7"
    |+| resonance "0.4" |+| cutoff "0.2"
    |+| resonance "0.4" |+| cutoff "0.2"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.76" --(138/60)/3
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.76" --(138/60)/3
 
 
-mapM_ ($ silence) [d3,d7]
+msil [d3,d7]
 
 
-d3 $ slow 8 $ within (0.33, 0.67) (0.25 ~>) $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
+chbass $ slow 8 $ within (0.33, 0.67) (0.25 ~>) $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "o"
    |+| vowel "o"
 
 
-d3 silence
+chbass silence
 
 
-d1 $ within (0, 0.5) (jux ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
+chdrum $ within (0, 0.5) (jux ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
 
 d6 silence
 d6 silence
 
 
 {-
 {-
-piston 4.a
+piston 6.a
 -}
 -}
 
 
-d3 $ slow 16 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
+chbass $ slow 16 $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
 
 
-d1 $ within (0, 0.5) (superimpose ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
+chdrum $ within (0, 0.5) (superimpose ((1%3) ~>)) $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
 
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| begin "0.7" |+| end "0.85"
    |+| begin "0.7" |+| end "0.85"
    |+| hcutoff "0.04" |+| hresonance "0.1"
    |+| hcutoff "0.04" |+| hresonance "0.1"
    |+| shape ((/5) <$> slow (5%3) sinewave1)
    |+| shape ((/5) <$> slow (5%3) sinewave1)
 
 
-d1 $ sound "[k*2 [sn ~ ~ wt] [~ k] sn [~ k]]/5"
+chdrum $ sound "[k*2 [sn ~ ~ wt] [~ k] sn [~ k]]/5"
 
 
-d1 $ sound "[k [sn ~ ~ wt] [~ k] sn]/4"
+chdrum $ sound "[k [sn ~ ~ wt] [~ k] sn]/4"
 
 
-d3 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
+chbass $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 
 
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| begin "0.7" |+| end "0.85"
    |+| begin "0.7" |+| end "0.85"
@@ -537,7 +516,7 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
    |+| cutoff "0.08" |+| resonance "0.01"
    |+| cutoff "0.08" |+| resonance "0.01"
 
 
-d1 $ sound "[k [sn ~ ~ k] [~ k] sn]/4"
+chdrum $ sound "[k [sn ~ ~ k] [~ k] sn]/4"
 
 
 d8 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
 d8 $ chop 64 $ sound "[fly ~ [fly ~ ~ fly] ~]/4"
    |+| cut "1"
    |+| cut "1"
@@ -552,7 +531,7 @@ d7 $ every 2 (density 2) $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ so
    |+| cut "1"
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
 
-d2 $ sound "{wt/2, [~ wtsn]/8}"
+chdrum2 $ sound "{wt/2, [~ wtsn]/8}"
 
 
 d9 $ stack [
 d9 $ stack [
    slow 2 $ smash 16 [1,2] $ sound "ant:1"
    slow 2 $ smash 16 [1,2] $ sound "ant:1"
@@ -562,33 +541,33 @@ d9 $ stack [
    |+| cut "1"
    |+| cut "1"
 ]
 ]
 
 
-d2 $ density (4%3) $ sound "[wtsn ~ wt]"
-d2 $ whenmod 5 3 rev $ density (4%3) $ sound "[wtsn ~ wt]"
-d2 $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
+chdrum2 $ density (4%3) $ sound "[wtsn ~ wt]"
+chdrum2 $ whenmod 5 3 rev $ density (4%3) $ sound "[wtsn ~ wt]"
+chdrum2 $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
 
 d5 $ whenmod 5 2 (|+| vowel "i o") $ whenmod 3 1 (slow 2) $ brak $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
 d5 $ whenmod 5 2 (|+| vowel "i o") $ whenmod 3 1 (slow 2) $ brak $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
    |+| hcutoff "0.09"
    |+| hcutoff "0.09"
    |+| hresonance "0.06"
    |+| hresonance "0.06"
 
 
-d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
+chdrum2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
 
-d1 $ sound "[k [sn ~ ~ k] [~ k*2] sn]/4"
+chdrum $ sound "[k [sn ~ ~ k] [~ k*2] sn]/4"
 
 
 {-
 {-
-piston 4.b
+piston 6.b
 -}
 -}
 
 
-mapM_ ($ silence) [d4,d6,d7,d8,d9]
+msil [d4,d6,d7,d8,d9]
 
 
 d9 $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
 d9 $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
    |+| speed "0.5"
    |+| speed "0.5"
    |+| cut "1"
    |+| cut "1"
    |+| end "0.5"
    |+| end "0.5"
 
 
-d10 $  every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "~ bzl" (density 1.5 "0 1"))
-  |+| cut "1"
-  |+| speed ((+1.6) <$> density 2.2 sinewave1)
-  |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
+chextra $ every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "~ bzl" (density 1.5 "0 1"))
+   |+| cut "1"
+   |+| speed ((+1.6) <$> density 2.2 sinewave1)
+   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
 
 
 d9 $ stack [
 d9 $ stack [
    (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
    (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
@@ -600,7 +579,7 @@ d9 $ stack [
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 ]
 ]
 
 
-d1 $ sound "[k*2 [sn ~ ~ k] [k k*2] sn]/4"
+chdrum $ sound "[k*2 [sn ~ ~ k] [k k*2] sn]/4"
 
 
 d7 $ whenmod 7 3 (density (5%4)) $ within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound "[ice plode]*2"
 d7 $ whenmod 7 3 (density (5%4)) $ within (0.5, 0.75) (iter 4) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 128 $ sound "[ice plode]*2"
    |+| cutoff "0.02"
    |+| cutoff "0.02"
@@ -617,18 +596,18 @@ d6 $ within (0, 0.5) (slow (7%6)) $ every 2 (0.5 <~) $ slow 8 $ rev . chop 32 $
 d8 $ (3 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
 d8 $ (3 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
    |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
    |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
 
 
-d10 $ stack [
+chextra $ stack [
   iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
   iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-  |+| gain "0.7"
-  |+| vowel "e o",
+   |+| gain "0.7"
+   |+| vowel "e o",
   every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "~ bzl" (density 1.5 "0 1"))
   every 3 brak $ whenmod 7 4 (within (0.5, 1) (density 2)) $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "~ bzl" (density 1.5 "0 1"))
-  |+| cut "1"
-  |+| speed ((+1.6) <$> density 2.2 sinewave1)
-  |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
+   |+| cut "1"
+   |+| speed ((+1.6) <$> density 2.2 sinewave1)
+   |+| pan ((+0.25).(/2) <$> density 4.2 sinewave1)
 ]
 ]
 
 
 {-
 {-
-d10 $ iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
+chextra $ iter 4 . density 2 $ (0.5 <~) $ ((1%16) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
    |+| gain "0.7"
    |+| gain "0.7"
    |+| vowel "e o"
    |+| vowel "e o"
 -}
 -}
@@ -642,14 +621,14 @@ d4 $ stack [
    |+| speed ((+0.76).(/3) <$> slow 1.1 sinewave1)
    |+| speed ((+0.76).(/3) <$> slow 1.1 sinewave1)
 ]
 ]
 
 
-mapM_ ($ silence) [d5,d7,d8,d9]
+msil [d5,d7,d8,d9]
 
 
 d9 $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
 d9 $ (0.75 ~>) $ whenmod 5 3 (density (3%2) . brak) $ bassParams $ rev $ (0.5 ~>) $ slow 2 . chop 8 $ sound "[dubb dubb:1]/2"
    |+| speed "0.5"
    |+| speed "0.5"
    |+| cut "1"
    |+| cut "1"
    |+| end "0.5"
    |+| end "0.5"
 
 
-mapM_ ($ silence) [d4,d6,d10]
+msil [d4,d6,d10]
 
 
 solo $ d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 solo $ d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"