Added tag display, still requires logic