New location branch

Does many of the issues but comments not displaying location