#17 Add stubs