Download nearly complete

just add Maybe before some types