updates types but broken tests. Fix tomorrow