Add stubs and poop model