Add a whole bunch of stuff; update Makefile and such