Make test pass... still lot of clean up to do