Changed model, to not use inheritence.
Began JSON interface