making things more into components to add to each content type