mostly finished with integrating testing