Temp fix for Makefile

Need to fix the the object linking (not finalized makefile!)