Filipe and Ingrid: part V, initial commit