new makefile
More makefile stuff