integration test coming along too