formatting
Moved class methods inside of BaseModel / added Proxy (experimental)