Two makefiles now