Feel free to hold off on this class and move it into your next pull request. I'll leave some comments on your questions anyway :smile: