[Ernesto] - first commit with some bugs yet