Serves now appropriately handles its argument, resolves #14