I derped up the constructors, pushing so I can edit locally.