Reorganized item dictionary creation.  Closes #6, #7, #9