Added progress bars and bunch of other shit