Need to rework some Map<K,V> stuff.