Added typeWrap... What a boring commit.