Merge changes from bonus branch in to main
Merge Wouter's work into the main branch.
On the 15th of May from 18:00 to 20:00, We will be upgrading GitLab. During this time the service will be unavailable, apologies for any inconvenience
Merge Wouter's work into the main branch.