Can/should we leverage `partition` here?