More types.. Not all perfect, but a good start.