Began item overhaul..merged some tool classes