Reorganized, started item class