First commit parte logica