All the extra code from last semester