Added progress bars

Added progress bars and deprecated some old code.