Feature/mcook49 fix dupes

[mcook7272]

Made changes based on meeting with Matt today to fix duplicate visits; please review and merge if appropriate. Thanks!