Refactor concierge

If we are not going to use Concierge as a class, it should become a module. 
Now the syntax is shorter and more clear
Hrm, spanning this `||` conditional across lines and comments makes this really tough to read.