First running version, some more tests needed