Initial code review

@evanstade Please review.  Hopefully the pull request flow will let you add comments.
what is the relevance of being on connect? Does that impact the installation flow?

I'd just leave this line out.