Add some of the features between 1 and 17 as well as additional possible features