Re-done

Signed-off-by: Martin <ole-martin@bratteng.me>
Re-done

Signed-off-by: Martin <ole-martin@bratteng.me>