More work on the code.