I have changed the makefile and moved a few things around