Add mass assign object. Code restruct. One step closer to observables