WIP: Working through making the integration test pass