More work on the whole project.