Begin readying code to merge with cccb9 - structure
Verify dice code