595-36

linked with types pages and made a few changes so that the right info
could be sent