Modifications to Makefile - INCOMPLETE!