Getting closer to something which works.