#11, Adding loading bar and enhancements