Intermediate commit - starting to fiddle with shutil.rmtree, wanna be sure nothing gets lost...