Begin converting to handle API