Merged in Joe's changes

We still have to rename the package and MyService.