allow several maps + separate not done today from map

@tlvince @hbj  ?