Progress but still broken