Do you anticipate that #18 will be merged first? If so, I'll update here.