Comment / #2230

Hi Tom,

I know that your a assigned to this task but if you don't mind I would like to implement step1. Is this okay for you?