Added mass model code.
Improved mass model. Mass model null for now.