Implement item addition and removal; clean stuff up