started adding in types