redesigned data model, added JSON fixtures