Many changes, I should really learn to commit more
Reverting to a normal makefile