Added factories and got rid of fixtures because I realized how awsome factories are.