Sounds good- can you plz create an issue to track changes that will be made in subsequent PRs?