Progress on my puzzle