Final Commit for the time-being. Mainly modified the Makefile so it is neater.