Miscelaneous

Move helper function, add setting for year of death