Add makefile, pre-amble, and edit