Will consolidate; makes sense from an annotation perspective as well.