[wip] Implementing birth/death
Merge branch 'master' into mark