Initial commit
Update to fit Alex's new Makefile.