Final version

Final version of the project assignment