Connect modified so it can accept entries with apostrophies and is much
cleaner to use