Minor update

- Adding more infrastructure to make this work