adds progress bar
progress bar beginnings
merge
merge
fixes js merge conflict junk