Wrote a new Makefile, its no longer impenetrable