Versión preliminar de la entrega final

Continued implementing stuff.

Co-Authored-By: andrra01 <andrra01@users.noreply.github.com>
Co-Authored-By: pablomorer <pablomorer@users.noreply.github.com>
Co-Authored-By: Nicolas Pardina <nicolaspardina@users.noreply.github.com>