Is that something we want to do before this merge or is it a future feature reqeust?