Even more progress to squash later