#73 Renaming some stuff for batch downloading
#73 More experimenting with API for offline downloading