Add index to Patch and refactor

Andre Offringarequested to merge
refactor-patch into master

The index is required to be able to remember what beam values belong to what patch. It's not yet used in this MR.

Merge request reports