Merged code, Fixed UI bug, Added progress so far