Copied all work we did on friday 21.10