A lot more work done. This is a good commit message.