Added stubs and makefile