Move the constructor over to the new shell list as well as onDeath thingy