Initial commit of Jims code
Made some small updates to the changes I had made to his makefile.