Refreshed the source files with the ones from the class project.
It basically gives us what I tried to write in my last edit, so
I deleted my version. This is just the class project now.