Yes - that makes sense. Was planning to refactor.