Added more types.  What am I doing?  I'm scared