Project 21-22

Documented by Christian Colomer and Ricardo Sanfeliu