More work on die, still doesn't pass all tests