jank ass progress bar sorry
merge