Starting to move over to content directive