Will this still be refactored into slots?