Add a Makefile and new objectives