Type definition code in, needs testing