Added everything else for HW2