Incomplete work.
models: Refactored everything.