Update branch to reflect Geoff's creation of separate anf and antelope dirs.
Update parameters for testing