Several changes to start introducing guesses. Still unfinished.