makefile works, going to bed
Might have accidentally deleted the most recent code