Multiple locations without activation stuff

Does everything that the original multiple-locations branch that @tdphillips was working on does, except with my branch as a base.