Realized that I should organize this differently