Cleaned up app and tests, added TrackedVisit