Added first (very, very broken) version of predictor, fixed problems with names for data