Starting to update to use new simpleapi