moving the makefile stuff back