Added preliminary highlight componenets