Refactor complete
	* Added progress bar (TODO Fix not working / unbound)
Refactor complete
	* Added progress bar (TODO Fix not working / unbound)