re-write task 1 and part of task 2. 11/27 passed