diff --git a/README.md b/README.md
index 5de08f9..0805ea6 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,21 @@
 # Anny FM: Battery 1,2,3
 
+[anny.audio](https://www.anny.audio)
+
 Originally performed live @ The Loft, Brighton, 4th July 2014.
 
-## Recordings
+- [Listen to Battery 1,2,3 on Bandcamp](https://annyfm.bandcamp.com/album/battery-123-live-at-the-loft)
 
-- [Battery 1,2,3 (Live) on Bandcamp](http://anny.audio/track/battery-123-live)
-- [Battery 1,2,3 (Live) on SoundCloud](https://soundcloud.com/anny-fm/battery-123-live)
+## Files
 
-## Source files
+`battery.scd` is a simple SuperCollider startup file to configure audio routing and load project samples.
 
-### battery123.tidal
+`battery.tidal` is the full Battery 1,2,3 composition for Tidal Cycles.
 
-This version updated April 2016 for Tidal 0.7 (jumping three whole major patches! Amazing) to use `cps (125/60)` instead of `bps (125/60)` hence everything becoming prefixed with `cf` - because for some reason, cycles are twice as fast as beats. (Surely it should be the other way round.)
+`samples.csv` contains sample attributions. All samples are available in `samples/` directory.
 
-Older versions of this composition with original notes are available on the `original-notes` tag of this repository.
+## License
 
-### battery123.megalet.tidal
+Recordings are CC-BY-SA Aneurin "Anny" Barker Snook 2015.
 
-Contains a big `let` directive to initialize all variables used in `battery123.tidal` (where they are recorded separately). Eval the whole block with `C-c C-e` and dive in.
-
-## Sample attributions
-
-```
-arpy bass bass3 hand jvbass peri psr rm tacscan tok trump uxay wobble
-```
-
-All of the above from [Dirt-Samples](https://github.com/tidalcycles/Dirt-Samples/tree/c2db9a0dc4ffb911febc613cdb9726cae5175223).
-
-```
-warbler
-```
-
-I didn't write down the attribution at the time, but I'm fairly certain it's sampled from [Birdsong in Tuscany.wav](http://www.freesound.org/people/evernaut/sounds/37286/) off [Freesound.org](http://www.freesound.org). You did a great job of bookmarking that, past me!
+Source code is [CC-BY-SA](https://creativecommons.org/licenses/by-sa/4.0/). Refer to sample attributions for sample licensing information, though they should all be royalty-free.
diff --git a/battery123.scd b/battery123.scd
index 47a16f1..1b56a01 100644
--- a/battery123.scd
+++ b/battery123.scd
@@ -1,3 +1,10 @@
+/*
+Anny: Piston LP
+anny.audio | pistonlp.co.uk
+
+See README.md for more information
+*/
+
 include("SuperDirt")
 
 Server.local.options.device = "Soundflower (2ch)";
diff --git a/battery123.tidal b/battery123.tidal
index 78023e0..406d5d6 100644
--- a/battery123.tidal
+++ b/battery123.tidal
@@ -2,12 +2,12 @@
 Anny FM: Battery 1,2,3
 anny.audio
 
-See README.md for more information
-
-~ Version info ~
 Current version: 1.0
 Compatibility:  Tidal Cycles 1.0-dev + SuperDirt 1.0-dev + SuperCollider 3.8
 Updated: 8 April 2017
+License: CC-BY-SA https://creativecommons.org/licenses/by-sa/4.0/
+
+See README.md for more information
 -}
 
 let bpm b = cps (b/60)
@@ -222,6 +222,7 @@ msil [d'perc, d'bass]
 
 -- ~b2drum w/o peri
 
+-- @b2arpy
 d'arpy $ cf $ iter 9 $ s "arpy*8"
   # n "2 1 3 1"
   # gain 0.7
@@ -304,36 +305,13 @@ d'drum $ cf $
   sound "[tok*2 [rm tok]] [psr:1 tok*2]"
   # n (slow 3 $ run 4)
 
-d'hand $ slow 8 $ rev . striate 256 $ s "hand*8"
-  # speed "0.7"
-  # shape ((/2) <$> slow (10/4) sine1)
-  # pan (scale 0.25 0.75 <$> slow (8/3) sine1)
-
--- ~b1perc3
-let b = brak . iter 4
-  in d'perc $ b $ s "uxay*4"
-     # n "1 0 1 2"
-     # gain 0.8
-     # shape "0.4 0.3 0.6"
-     # speed "[0.7 1 1.2]/2"
+-- ~b1hand
+-- ~b1perc3 @ (1)
 
 -- ~b3bass
-d'bass $ cf $
-  spread slow [2,(7/4)] $
-  whenmod 7 6 (density 1.5) $
-  iter 4 $
-  s "bass*4"
-  # n "0 1"
-  # begin 0.4
-  # speed 1.2
-  # shape 0.2
-
 -- ~b1tac
-d'tac $ cf . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan] ! ~ ~"
-  # gain 0.8
-  # vowel (slow 3 "e u")
 
+-- @b3bassloud
 d'bass $ cf $
   spread slow [2,(7/4)] $
   whenmod 7 6 (density 1.5) $
@@ -375,50 +353,13 @@ d'drum $ cf $
   sound "[tok*2 [rm tok]] [psr:1 tok*2]"
   # n (slow 3 $ run 4)
 
--- ~b2perc
-let b = brak . iter 4 -- (1)
-  in d'perc $ b $ s "uxay*4"
-     # n "1 0 1 2"
-     # gain 0.8
-     # shape "0.4 0.3 0.6"
-     # speed "[0.7 1 1.2]/2"
-
--- ~b2bass
-d'bass $ slow 8 $
-  s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
-  # n (slow 2.8 "0 1 2")
-  # vowel "i"
-  # speed 0.8
-  # shape (scale 0.25 0.75 $ saw1) -- (2) replaces (1)
-
+-- ~b2perc @ (1)
+-- ~b2bass @ (2)
 -- ~b1tac
-d'tac $ cf . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
-
--- ~b1bass1
-d'bass2 $ slow 4 $ s "bass3 [~ bass3] ! ~"
-  # begin "0.2"
-  # n "0 1 0 0"
-  # speed (scale 1 (4/3) $ slow 8 sine1)
-
--- ~b3arpy
-d'arpy $ cf $
-  iter 9 $ s "arpy*8"
-  # n "2 1 3 1"
-  # gain 0.7
-
+-- ~b1bass1 [on channel d'bass2]
+-- ~b3arpy @ (1)
 -- ~b1warbler
-d'warb $ slow 4 $ striate 32 $ s "warbler"
-  # n (slow 7 $ run 7)
-  # gain "0.8"
-
 -- ~b1hand
-d'hand $ slow 8 $ rev . striate 256 $ s "hand*8"
-  # speed 0.7
-  # shape (scale 0 0.5 $ slow (10/4) sine1)
-  # pan (scale 0.25 0.75 $ slow (8/3) sine1)
 
 msil [d'perc, d'bass, d'tac, d'bass2, d'hand]
 d'drum silence
diff --git a/samples.csv b/samples.csv
index 1f75d63..cebacfb 100644
--- a/samples.csv
+++ b/samples.csv
@@ -1,44 +1,37 @@
 Sample,Index,File,Origin,URL,Notes
-arpy,0,,,,
-arpy,1,,,,
-arpy,2,,,,
-bass,0,,,,
-bass,1,,,,
-bass3,0,,,,
-bass3,1,,,,
-hand,0,,,,
-jvbass,0,,,,
-jvbass,1,,,,
-jvbass,2,,,,
-peri,0,,,,
-psr,0,,,,
-psr,1,,,,
-rm,0,,,,
-rm,1,,,,
-tacscan,0,,,,
-tok,0,,,,
-tok,1,,,,
-tok,2,,,,
-tok,3,,,,
-trump,0,,,,
-trump,1,,,,
-trump,2,,,,
-trump,3,,,,
-trump,4,,,,
-trump,5,,,,
-trump,6,,,,
-trump,7,,,,
-trump,8,,,,
-trump,9,,,,
-trump,10,,,,
-uxay,0,,,,
-uxay,1,,,,
-uxay,2,,,,
-warbler,0,,,,
-warbler,1,,,,
-warbler,2,,,,
-warbler,3,,,,
-warbler,4,,,,
-warbler,5,,,,
-warbler,6,,,,
-wobble,0,,,,
+arpy,0,arpy03.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+arpy,1,arpy05.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+arpy,2,arpy08.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+bass,0,000_bass1.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+bass,1,001_bass2.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+bass3,0,83245__zgump__bass-0201.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+bass3,1,83246__zgump__bass-0202.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+hand,0,hand1-mono.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+jvbass,0,000_01.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+jvbass,1,001_02.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+jvbass,2,002_03.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+peri,0,bd.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+psr,0,008_09.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+psr,1,014_15.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+rm,0,RIM0.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+rm,1,RIMA.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+tacscan,0,013_pexpl.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+tok,0,000_0.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+tok,1,001_1.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+tok,2,002_2.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+tok,3,003_3.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+trump,0,tightstabb.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+trump,1,tightstabblowoct.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+trump,2,tightstabe.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+trump,3,tightstabg.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+uxay,0,000_bar.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+uxay,1,001_erk.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+uxay,2,002_foo.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
+warbler,0,warbler.001.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,1,warbler.002.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,2,warbler.003.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,3,warbler.004.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,4,warbler.005.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,5,warbler.006.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+warbler,6,warbler.007.wav,Freesound: Birdsong in Tuscany.wav,http://www.freesound.org/people/evernaut/sounds/37286/,
+wobble,0,000_0.wav,Dirt,https://github.com/tidalcycles/Dirt-Samples,
diff --git a/samples/trump/trumpfunk107a.wav b/samples/trump/trumpfunk107a.wav
deleted file mode 100644
index 6e0ef6b..0000000
Binary files a/samples/trump/trumpfunk107a.wav and /dev/null differ
diff --git a/samples/trump/trumpstabb.wav b/samples/trump/trumpstabb.wav
deleted file mode 100644
index 996467e..0000000
Binary files a/samples/trump/trumpstabb.wav and /dev/null differ
diff --git a/samples/trump/trumpstabblowoct.wav b/samples/trump/trumpstabblowoct.wav
deleted file mode 100644
index 87b82e3..0000000
Binary files a/samples/trump/trumpstabblowoct.wav and /dev/null differ
diff --git a/samples/trump/trumpstabe.wav b/samples/trump/trumpstabe.wav
deleted file mode 100644
index 9cb9320..0000000
Binary files a/samples/trump/trumpstabe.wav and /dev/null differ
diff --git a/samples/trump/trumpstabg.wav b/samples/trump/trumpstabg.wav
deleted file mode 100644
index 7d0a651..0000000
Binary files a/samples/trump/trumpstabg.wav and /dev/null differ
diff --git a/samples/trump/trumpstabschord.wav b/samples/trump/trumpstabschord.wav
deleted file mode 100644
index 19d6a0b..0000000
Binary files a/samples/trump/trumpstabschord.wav and /dev/null differ
diff --git a/samples/trump/trumptightstabschord.wav b/samples/trump/trumptightstabschord.wav
deleted file mode 100644
index 003e5ef..0000000
Binary files a/samples/trump/trumptightstabschord.wav and /dev/null differ