Makefile is now messy but functional