Working better now. Almost to the first working version