Pushing what joel and I worked on

Ensuring connection to router.