Fixed up import problems for assign1 to assign2