Færdiggjort

as we discussed 2