Fixture Adapter works, but needs some clean up work