continued updates to api rework and initial implementation