Finish implementing item delete functionality.
Merge conflicts.
Minor bug fixes.