Stash commit of makefile stuff; needs more work.