Finally converted to a Makefile