up and running version passing some of the tests