Starting to compartmentalize
Starting to compartmentalize
Finished part 2