Fixed duplication issue.  App is now ready for design, and all that's left is some polish (not necessary for submission)