HR 207

Merge request for HR 201, 201-sub task I, HR 201-sub task II, HR 207 & HR 208. Thanks.