Update/types/cosas?

@eparejatobes I'm a bit confused. What's up with this branch?