Update Makefile and begin demos.h