make a couple classes have non-null arguments