Checkpoint; work on refactoring item parsing.