Bootstrapped code, added first couple of tests