Update Makefile

Not quite ready for prime time, but almost there