Adding in logic for templatic comparison without components, updated database.