adding item classes
merge conflicts