Need to solve the hovers and add the contents