Finished 3.2 Entity Objects for the design

Finished by Theodore Gossens, Armand Obreja, Goran Pavlovic, Tom
LaMantia, Rajdeep Gill