Starting to compartmentalize everything for easier management