Do we want the order to be key/value instead? Value first is probably better I guess. As long as all the methods consistent.