diff --git a/README.md b/README.md
index 63294de..741388f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ is primitive as heck
 
 ## Versions
 
-- 24 March 2015 (This version)
+- 25 March 2015 (This version)
+- 24 March 2015 (d0687cde1f298ba539a49794eeac01516ed432a7)
 - 23 March 2015 (36997bc979d017c8ff685be81b0e764e4ade3777)
 - 22 March 2015 (7efe45cf315444a9adf2dc020fae8f50c8b8714d)
 - 21 March 2015 (a3f423ba41ae1a897c5105288a80db4011c94f49)
diff --git a/piston.tidal b/piston.tidal
index 3f55e01..72374cb 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -13,6 +13,8 @@ piston i
 d5 $ slow 16 $ jux (0.5 <~) $ rev . striate 256 $ sound "fly"
    |+| hcutoff "0.09"
    |+| hresonance "0.06"
+   |+| gain "1"
+--   |+| gain "0.1"
 
 d2 $ sound "wt/2"
 
@@ -48,8 +50,8 @@ d1 $ sound "[k(3,8)]/2"
 d1 $ sound "{k(3,8), [~ sn]}/2"
 d1 $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
 
+d4 silence
 d5 silence
-d2 $ sound "{wt/2, [~ wtsn]/8}"
 
 d1 $ within (0.5, 1) (chop 8) $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
 
@@ -57,13 +59,14 @@ d3 $ (every 2 $ within (0.25, 0.75) (0.5 ~>)) $ slow 8 $ rev . chop 16 $ bassPar
 
 d1 $ every 3 (density (5%4)) $ within (0.5, 1) (chop 8) $ sound "{k(3,8), [~ ~ sn [~ sn*3]/2]}/2"
 
+d2 $ sound "{wt/2, [~ wtsn]/8}"
+
 d1 silence
 
 {-
 piston ii
 -}
 
-d4 silence
 d2 $ sound "[~ wt*4 ~ wt*2 ~]/5"
 
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
@@ -72,7 +75,6 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| shape ((/5) <$> slow (5%3) sinewave1)
 --   |+| gain "0.1"
 
-d3 silence
 d1 $ sound "[k [sn ~ ~ wt] k*2 sn]/4"
 
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
@@ -85,17 +87,15 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "i"
 
---d1 $ sound "[k [sn ~ ~ k] k*2 sn]/4"
-
-d7 $ jux ((1%8) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
---d7 $ within (1, 2) rev $ jux ((1%8) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
-   |+| gain "0.7"
-
 d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "o i"
 
 d6 silence
-d7 silence
+
+d1 $ sound "[k*4 [sn ~ ~ k] k*4 sn]/4"
+
+solo $ d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+   |+| vowel "o i"
 
 -- d1 $ sound "[k*2 [sn ~ ~ wt] k*2 sn]/4"
 
@@ -103,14 +103,11 @@ d7 silence
 piston iii
 -}
 
-d2 silence
-d1 silence
-
 d3 $ within (1%3, 2%3) (|+| gain "0.5") $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "o i"
 
 d2 $ slow (3%2) $ sound "hh*2"
-d1 $ slow (3%2) $ sound "[k*2 [sn ~ ~ ~ k] [~ ~ ~ ~ k] [sn [sn*2]/4]]/4"
+d1 $ slow (3%2) $ sound "[k*2 [sn ~ ~ ~ k] [~ ~ ~ ~ k] sn]/4"
 
 hush
 
@@ -122,39 +119,46 @@ d4 $ slow 12 $ rev . chop 64 $ sound "fly:1"
 
 d2 $ slow (3%2) $ sound "[hh*2 [hh wt] hh*2 !]/4"
 
-d1 $ slow (3%2) $ sound "[k*2 [sn ~ ~ ~ k] [~ ~ ~ ~ k] [sn [sn*2]/4]]/4"
-
-d3 $ slow (3%2) . slow 4 $ rev . chop 24 $ bassParams $ sound "[dubb dubb:1]/2"
-|+| vowel "e e i"
-
-hush
-
-d4 silence
-
 d1 silence
 
-d3 $ slow (3%2) . slow 4 $ rev . chop 24 $ bassParams $ sound "[dubb dubb:1]/2"
-|+| vowel "e e i"
-|+| cutoff "0.02" |+| resonance "0.1"
+d1 $ slow (3%2) $ sound "[k*2 [sn ~ ~ ~ k] [~ ~ ~ ~ k] sn]/4"
+
+d3 $ slow (3%2) . slow 4 $ brak $ rev . chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
+|+| vowel "e o i"
+
+d1 silence
+d4 silence
 
 {-
 piston iv
 -}
 
+d3 $ slow (3%2) . slow 4 $ rev . chop 24 $ bassParams $ sound "[dubb dubb:1]/2"
+|+| vowel "e e i"
+|+| cutoff "0.02" |+| resonance "0.1"
+
 d2 $ sound "wt*2"
 |+| vowel "[u e u a]/2"
 
-d1 $ sound "[k [sn k] [k sn] [~ sn] [~ k] sn [k [sn k]]]/7"
+d1 $ sound "[k [sn k] [k sn] [~ sn] [~ k] sn [k [k sn]]]/7"
 
-d7 $ jux ((1%8) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
+-- NUKE THIS. gets really fucking annoying
+
+d7 $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
 --d7 $ within (1, 2) rev $ jux ((1%8) <~) $ chop 16 $ sound "[ice [~ ice] ~ ~]/4"
    |+| gain "0.7"
 
-d1 $ sound "[[k ~ k sn] ~ k sn*2]/4"
+d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
+|+| speed "1.2"
+|+| shape ((+0.25).(/2) <$> density 4 sinewave1)
 
-d3 $ slow 8 $ rev.chop 24 $ bassParams $ sound "[dubb dubb:1]/2"
+d1 silence
+d1 $ sound "[[k ~ k sn] ~ k [sn sn/4]]/4"
 
-d3 $ (|+| begin ((/2) <$> (density (5%4) $ sinewave1))) $ (|+| end ((+0.05).(/2) <$> (density (5%4) $ sinewave1))) $ slow 8 $ rev.chop 24 $ bassParams $ sound "[dubb dubb:1]/2"
+d3 $ slow 8 $ ((1%8) <~) $ chop 32 $ bassParams $ sound "[dubb dubb:1]/2"
+|+| speed "1.2"
+|+| shape ((+0.25).(/3) <$> density 4 sinewave1)
+|+| vowel "u a"
 
 d7 silence
 d1 silence
@@ -181,7 +185,7 @@ d7 $ slow 5 . chop 15 $ sound "ice"
 hush
 d1 $ sound "[k [sn ~ k] [~ ~ sn] ~]/8"
 
-d2 $ sound "[wt*3 ~]/2" |+| gain "0.7" |+| shape ((/2) <$> slow 3 saw1)
+d2 $ 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"
 
@@ -192,10 +196,10 @@ d4 $ slow (4%3) . slowspread ($) [slow 1, density (5%4)] $ slow 12 $ slowspread
 d6 $ rev . chop 12 $ sound "bz/4"
    |+| vowel "o"
 
-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"
-
 d1 silence
 
+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"
+
 d1 $ sound "{k, ~ sn}"
 d1 $ sound "[[k ~ k] {k, sn}]/2"
 
@@ -234,29 +238,25 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| delay "0.6" |+| delayfeedback "0.5" |+| delaytime "0.766" --(138/60)/3
 
 d1 $ sound "[k [sn ~ ~ wt] [~ k] sn]/4"
-d1 $ sound "[k [sn ~ ~ k] [~ k] sn]/4"
 
 d2 $ 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]"
 
-d6 silence
-d4 silence
-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]"
 
 d1 $ sound "[k [sn ~ ~ k] [~ k*2] sn]/4"
 
+d3 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
+
 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"
 
-d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
+d4 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "o i"
 
-d3 silence
-d5 silence
-
-d1 silence
+solo $ d2 $ within (0.5, 1) (slow (3%2) . chop 4) $ whenmod 5 3 (rev . chop 8) $ density (4%3) $ sound "[wtsn ~ wt]"
 
 hush