Add fixtures
Refactor and general cleanup