Updated repo

Danielrequested to merge
updated_repo into main

Updated the repo with the last changes that led up to the demo.

Merge request reports