Shouldn't we be using `habitat` for this?