Added a ton of new stuff, and a make package!