Yeah, that'd probably help! I definitely rushed this PR; just to review the concept of changing the API layouts