added some of the types, testing is not working