updated week2 assignment, week4+5 assignment stalled