-Starting to add highlighting