added edit item, but has bugs- ran out of time to finish fixing
merge conflicts resolved
merge conflicts resolved