turned item into separate class