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