Starting to add more API support.  Still need to use <|> to handle
different cases.