Progress on the code