Do the typing (46/48)

Do the typing