Removing redundant helper method for path that doesn't need it
Edit process basically ok.
About ready to merge, this branch is getting long, and Steven needs to smooth out the rough edges I've created
Modifying spec to match non-batch upload