added a bunch of types