@heck Maybe you read through it here, document/ammend additional changes if necessary and then merge this