extensive edits and new classes supporting 2014 model