Making progress, but had some issues with some of the names.