Changed how items work and further unified classes