setting up models part 1
mergin master