added types I forgot to add previously, working on value class