Undid stupidity :P.  Also Adding in death