started a few, added some stubs