Analysis - Entity & Model

trying new encapsulation aproach to reduce the mess on one page