More progress. Less commit message.