needs to be split into another directive in a ticket. Commenting out