new model and data set
saving merge conflict fixes
deleted old driver spec