Dev

Refactored with fixtures.