added year and major to form/data models
merge conflict resolved