Made the progress stuff reusable