eventually yes :) I figured that would be part of the general model cleanup we need to do.