Add another big updated

Almost done!