finish separating out types