I've done this already, With the last merge, I made this possible for cristina to implement when she merged.