Make progress 3 (7/36)

Make progress 3