So this branch includes a previous commit from #427. We need to get that one merged first before merging this one.