Issue update.  Outlined move to 1 file = 1 issue.