Second 2 tasks

I'll add the rest later