Implemented changes dylan suggested, and refactored file names to be appropriate. https://app.asana.com/0/19128794071848/19632912981978