WIP merge
model fixtures
WIP