Began working on the abstraction layer above the fixtures.