Oops (how did that happen?)
Add support for multiple servers, now including Shelf