And the makefile, too