Update dying logic to use data model
Add dead status
Merge