Started fleshing out models and fixtures