Type up (15/18)

Type up