Working on task 21 (Familiarization)

Related Work Items: #21