Worth remembering that fanfic doesn’t automatically become infringement because it is commercial and doesn’t automatically become non-infringing if it is non-commercial. It’s one factor and the overall analysis is more complicated.