88 files changed, 1302 insertions, 967 deletions