Eliminate more code in favor of reuse, no further implementation added
Merge branch 'master' of https://github.com/ICS240Group4/Project4
Eliminate more excess code, attempting to streamline. No new code added