Add missing moves.
Add category model implementation.
Merge branch 'datamodels' into develop