@keegan is working on fixing an edge case here, which was discovered on Friday. Once that is done, it will be nice to close this off
