Final commit. Removed unnecessary @.  Refactored method.  Will do a better job with this on next project.