Add puts-statement for progress

Prepare code to react to git-conflicts