stubs, tests, cleanup - todo's