Major refactor of die object and array.