diff --git a/makefile b/makefile
index b90cdc39714e58013d72eff348997829e3397efd..f97373cd3eb8efebb2bb95762a9aca9252bd8e67 100644
--- a/makefile
+++ b/makefile
@@ -1,88 +1,87 @@
-all: setup sample glop GTM luckett hasan  grace landsat eco carter DVTSD MDM_AED stud f2f ftir book  dharmae ftir pedestrian 
+all: setup sample glop GTM luckett hasan  grace landsat eco carter DVTSD MDM_AED stud vic MDM_AED f2f ftir book  dharmae ftir pedestrian 
 
-setup:
+
+setup: clean
 	cp ~/working/ro-crate-js/lib/crate.js  $(SRC_PATH)
 
-index:
+index: 
 	node ro-crate-deposit.js --repo=$(REPO_PATH)  $(SRC_PATH)/*
 	node make-ocfl-index.js --repo $(REPO_PATH) 
 
-sample: 
-	find $(SRC_PATH)/sample -name ~* -delete
-	find $(SRC_PATH)/sample -name .DS_Store  -delete
-	calcyfy -r $(SRC_PATH)/sample  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+clean: 
+	#find $(SRC_PATH) -name ~* -delete
+	#find $(SRC_PATH) .DS_Store  -delete
+
+sample:  clean
+	calcyfy -r $(SRC_PATH)/sample  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
 
-glop: 
-	find $(SRC_PATH)/Glop_Pot -name ~* -delete
-	find $(SRC_PATH)/Glop_Pot -name .DS_Store  -delete
-	calcyfy -r $(SRC_PATH)/Glop_Pot -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+glop: clean
+	calcyfy -r $(SRC_PATH)/Glop_Pot -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 	# TODO: needs a license
 
-GTM: 
-	find $(SRC_PATH)/GTM -name ~* -delete
-	find $(SRC_PATH)/GTM -name .DS_Store  -delete
-	calcyfy -r $(SRC_PATH)/GTM -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+GTM: clean
+	calcyfy -r $(SRC_PATH)/GTM -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-luckett: 
-	find $(SRC_PATH)/luckett -name ~* -delete
-	find $(SRC_PATH)/luckett -name .DS_Store  -delete
-	calcyfy -r $(SRC_PATH)/luckett  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+luckett: clean
+	calcyfy -r $(SRC_PATH)/luckett  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-hasan:
-	calcyfy -r $(SRC_PATH)/TCSVT-Hasan  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+hasan: clean
+	calcyfy -r $(SRC_PATH)/TCSVT-Hasan  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
  
-grace:
+grace: clean
+	
+	
     #TODO: Error with creators - needs debugging
-	calcyfy -r $(SRC_PATH)/zunyi_xie_grace  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+	calcyfy -r $(SRC_PATH)/zunyi_xie_grace  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-landsat:
-	calcyfy -r $(SRC_PATH)/landsat  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+landsat: clean
 
+	calcyfy -r $(SRC_PATH)/landsat  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-MDM_AED:
-	calcyfy -r $(SRC_PATH)/MDM_AED  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
 
-stud:
-	calcyfy -r $(SRC_PATH)/IntStudStenberg  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+MDM_AED: clean
+	calcyfy -r $(SRC_PATH)/MDM_AED  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
+stud: clean
+	calcyfy -r $(SRC_PATH)/IntStudStenberg  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-carter: 
-	calcyfy -r $(SRC_PATH)/Carter_APM  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
-	calcyfy -r $(SRC_PATH)/Carter_QAA  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
 
-eco:
-	calcyfy -r $(SRC_PATH)/ecohydrology2014  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+carter: clean
+	calcyfy -r $(SRC_PATH)/Carter_APM  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
+	calcyfy -r $(SRC_PATH)/Carter_QAA  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
+eco: clean
+	calcyfy -r $(SRC_PATH)/ecohydrology2014  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
 ftir: 
     # No data with this one - add it on server?
-	calcyfy -r $(SRC_PATH)/ftir  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
-vic:
-	calcyfy -r $(SRC_PATH)/Victoria_Arch  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+	calcyfy -r $(SRC_PATH)/ftir  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
+vic: clean
+	calcyfy -r $(SRC_PATH)/Victoria_Arch  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-book:
-	calcyfy  $(SRC_PATH)/IE4783007  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+book: clean
+	calcyfy  $(SRC_PATH)/IE4783007  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-f2f: 
-	calcyfy $(SRC_PATH)/farms_to_freeways  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+f2f: clean
+	calcyfy $(SRC_PATH)/farms_to_freeways  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
 
-dharmae:
-	calcyfy $(SRC_PATH)/dharmae  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+dharmae: clean
+	calcyfy $(SRC_PATH)/dharmae  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-pedestrian:
-	calcyfy $(SRC_PATH)/pedestrian_d3  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+pedestrian: clean
+	calcyfy $(SRC_PATH)/pedestrian_d3  -c https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 
-pull:
+pull: 
     # WARNING - this is *BIG*
 	mkdir -p $(SRC_PATH)
 	cd $(SRC_PATH)
-	wget -r -np -nH --cut-dirs=3 https://data.research.uts.edu.au/examples/ro-crate/examples/src/
+	wget -r -np -nH --cut-dirs=3 https://data.research.uts.edu.au/examples/ro-crate/examples/src/crate.js
 	cd -
 
-todo:
-	# file:///Users/124411/working/ro-crate-examples/src/curation/
+todo: clean
+	# file:///Users/124411/working/ro-crate-examples/src/crate.jscuration/