Stepping away from service location
Simplify
Merge pull request #1 from sheldonh/registry

Just a registry