Added features to the data, and modified current learning methods to handle new data format, but ignore features for now