Moved everything from Han's version of the project into the proper spots, removed duplicates.