reorganizing code in preparation for all the different classes we will need