Added some specs and conditionals along with a die class