This just needs to be deployed before May 1st.  We can have this discussion before the merge.