First commit

First commit after forking, Most name changes and typos.