Get everything to work for HW5